<html>
<head><meta charset="utf-8"><title>Place 2.0 git rebase · t-compiler/help · Zulip Chat Archive</title></head>
<h2>Stream: <a href="https://rust-lang.github.io/zulip_archive/stream/182449-t-compiler/help/index.html">t-compiler/help</a></h2>
<h3>Topic: <a href="https://rust-lang.github.io/zulip_archive/stream/182449-t-compiler/help/topic/Place.202.2E0.20git.20rebase.html">Place 2.0 git rebase</a></h3>

<hr>

<base href="https://rust-lang.zulipchat.com">

<head><link href="https://rust-lang.github.io/zulip_archive/style.css" rel="stylesheet"></head>

<a name="166705876"></a>
<h4><a href="https://rust-lang.zulipchat.com#narrow/stream/182449-t-compiler/help/topic/Place%202.0%20git%20rebase/near/166705876" class="zl"><img src="https://rust-lang.github.io/zulip_archive/assets/img/zulip.svg" alt="view this post on Zulip" style="width:20px;height:20px;"></a> Santiago Pastorino <a href="https://rust-lang.github.io/zulip_archive/stream/182449-t-compiler/help/topic/Place.202.2E0.20git.20rebase.html#166705876">(May 28 2019 at 11:20)</a>:</h4>
<p>I'm rebasing <a href="https://github.com/rust-lang/rust/pull/60913" target="_blank" title="https://github.com/rust-lang/rust/pull/60913">https://github.com/rust-lang/rust/pull/60913</a> and hitting a lot of conflicts in the way</p>



<a name="166705896"></a>
<h4><a href="https://rust-lang.zulipchat.com#narrow/stream/182449-t-compiler/help/topic/Place%202.0%20git%20rebase/near/166705896" class="zl"><img src="https://rust-lang.github.io/zulip_archive/assets/img/zulip.svg" alt="view this post on Zulip" style="width:20px;height:20px;"></a> Santiago Pastorino <a href="https://rust-lang.github.io/zulip_archive/stream/182449-t-compiler/help/topic/Place.202.2E0.20git.20rebase.html#166705896">(May 28 2019 at 11:20)</a>:</h4>
<p>I'm wondering about good strategies to do so and avoid hitting all the conflicts at once</p>



<a name="166705927"></a>
<h4><a href="https://rust-lang.zulipchat.com#narrow/stream/182449-t-compiler/help/topic/Place%202.0%20git%20rebase/near/166705927" class="zl"><img src="https://rust-lang.github.io/zulip_archive/assets/img/zulip.svg" alt="view this post on Zulip" style="width:20px;height:20px;"></a> Santiago Pastorino <a href="https://rust-lang.github.io/zulip_archive/stream/182449-t-compiler/help/topic/Place.202.2E0.20git.20rebase.html#166705927">(May 28 2019 at 11:21)</a>:</h4>
<p>I was thinking that would be better to make the rebase in a tinier fashion but unsure if what I want is the best thing or if it's even possible</p>



<a name="166705946"></a>
<h4><a href="https://rust-lang.zulipchat.com#narrow/stream/182449-t-compiler/help/topic/Place%202.0%20git%20rebase/near/166705946" class="zl"><img src="https://rust-lang.github.io/zulip_archive/assets/img/zulip.svg" alt="view this post on Zulip" style="width:20px;height:20px;"></a> Santiago Pastorino <a href="https://rust-lang.github.io/zulip_archive/stream/182449-t-compiler/help/topic/Place.202.2E0.20git.20rebase.html#166705946">(May 28 2019 at 11:21)</a>:</h4>
<p>let's say that master is <code>1 -&gt; 2 -&gt; 3 -&gt; 4 -&gt; 5</code> and Place 2.0 is <code>1 -&gt; 6</code></p>



<a name="166706030"></a>
<h4><a href="https://rust-lang.zulipchat.com#narrow/stream/182449-t-compiler/help/topic/Place%202.0%20git%20rebase/near/166706030" class="zl"><img src="https://rust-lang.github.io/zulip_archive/assets/img/zulip.svg" alt="view this post on Zulip" style="width:20px;height:20px;"></a> Santiago Pastorino <a href="https://rust-lang.github.io/zulip_archive/stream/182449-t-compiler/help/topic/Place.202.2E0.20git.20rebase.html#166706030">(May 28 2019 at 11:22)</a>:</h4>
<p>if I do git rebase I just get <code>1 -&gt; 2 -&gt; 3 -&gt; 4 -&gt; 5 -&gt; 6</code> with all the conflicts at once</p>



<a name="166706052"></a>
<h4><a href="https://rust-lang.zulipchat.com#narrow/stream/182449-t-compiler/help/topic/Place%202.0%20git%20rebase/near/166706052" class="zl"><img src="https://rust-lang.github.io/zulip_archive/assets/img/zulip.svg" alt="view this post on Zulip" style="width:20px;height:20px;"></a> Santiago Pastorino <a href="https://rust-lang.github.io/zulip_archive/stream/182449-t-compiler/help/topic/Place.202.2E0.20git.20rebase.html#166706052">(May 28 2019 at 11:23)</a>:</h4>
<p>I was wondering if it's possible to make git rebase try, first <code>1 -&gt; 2 -&gt; 6</code> and if that works go to the next step</p>



<a name="166706062"></a>
<h4><a href="https://rust-lang.zulipchat.com#narrow/stream/182449-t-compiler/help/topic/Place%202.0%20git%20rebase/near/166706062" class="zl"><img src="https://rust-lang.github.io/zulip_archive/assets/img/zulip.svg" alt="view this post on Zulip" style="width:20px;height:20px;"></a> Santiago Pastorino <a href="https://rust-lang.github.io/zulip_archive/stream/182449-t-compiler/help/topic/Place.202.2E0.20git.20rebase.html#166706062">(May 28 2019 at 11:23)</a>:</h4>
<p>then do <code>1 -&gt; 2 -&gt; 3 -&gt; 6</code> and if it works continue and so on until I get a conflict</p>



<a name="166706131"></a>
<h4><a href="https://rust-lang.zulipchat.com#narrow/stream/182449-t-compiler/help/topic/Place%202.0%20git%20rebase/near/166706131" class="zl"><img src="https://rust-lang.github.io/zulip_archive/assets/img/zulip.svg" alt="view this post on Zulip" style="width:20px;height:20px;"></a> Santiago Pastorino <a href="https://rust-lang.github.io/zulip_archive/stream/182449-t-compiler/help/topic/Place.202.2E0.20git.20rebase.html#166706131">(May 28 2019 at 11:24)</a>:</h4>
<p>is something like that possible? what do you people use as a way strategy to rebase things that are giving a LOT of conflicts</p>



<a name="166706154"></a>
<h4><a href="https://rust-lang.zulipchat.com#narrow/stream/182449-t-compiler/help/topic/Place%202.0%20git%20rebase/near/166706154" class="zl"><img src="https://rust-lang.github.io/zulip_archive/assets/img/zulip.svg" alt="view this post on Zulip" style="width:20px;height:20px;"></a> Santiago Pastorino <a href="https://rust-lang.github.io/zulip_archive/stream/182449-t-compiler/help/topic/Place.202.2E0.20git.20rebase.html#166706154">(May 28 2019 at 11:24)</a>:</h4>
<p>I'm getting small conflicts that are easy to fix inline but also there are sections that were moved to new files that are killing me in the process</p>



<a name="166708939"></a>
<h4><a href="https://rust-lang.zulipchat.com#narrow/stream/182449-t-compiler/help/topic/Place%202.0%20git%20rebase/near/166708939" class="zl"><img src="https://rust-lang.github.io/zulip_archive/assets/img/zulip.svg" alt="view this post on Zulip" style="width:20px;height:20px;"></a> oli <a href="https://rust-lang.github.io/zulip_archive/stream/182449-t-compiler/help/topic/Place.202.2E0.20git.20rebase.html#166708939">(May 28 2019 at 12:03)</a>:</h4>
<p>how about throwing away the conflicting large changes and just doing them again?</p>



<a name="166708943"></a>
<h4><a href="https://rust-lang.zulipchat.com#narrow/stream/182449-t-compiler/help/topic/Place%202.0%20git%20rebase/near/166708943" class="zl"><img src="https://rust-lang.github.io/zulip_archive/assets/img/zulip.svg" alt="view this post on Zulip" style="width:20px;height:20px;"></a> oli <a href="https://rust-lang.github.io/zulip_archive/stream/182449-t-compiler/help/topic/Place.202.2E0.20git.20rebase.html#166708943">(May 28 2019 at 12:03)</a>:</h4>
<p>or are there many?</p>



<a name="166711034"></a>
<h4><a href="https://rust-lang.zulipchat.com#narrow/stream/182449-t-compiler/help/topic/Place%202.0%20git%20rebase/near/166711034" class="zl"><img src="https://rust-lang.github.io/zulip_archive/assets/img/zulip.svg" alt="view this post on Zulip" style="width:20px;height:20px;"></a> Santiago Pastorino <a href="https://rust-lang.github.io/zulip_archive/stream/182449-t-compiler/help/topic/Place.202.2E0.20git.20rebase.html#166711034">(May 28 2019 at 12:31)</a>:</h4>
<p>yeah, my approach was going to be that one</p>



<a name="166711119"></a>
<h4><a href="https://rust-lang.zulipchat.com#narrow/stream/182449-t-compiler/help/topic/Place%202.0%20git%20rebase/near/166711119" class="zl"><img src="https://rust-lang.github.io/zulip_archive/assets/img/zulip.svg" alt="view this post on Zulip" style="width:20px;height:20px;"></a> Santiago Pastorino <a href="https://rust-lang.github.io/zulip_archive/stream/182449-t-compiler/help/topic/Place.202.2E0.20git.20rebase.html#166711119">(May 28 2019 at 12:32)</a>:</h4>
<p>but seems like if a git rebase step-by-step thing exists it’s better</p>



<a name="166711143"></a>
<h4><a href="https://rust-lang.zulipchat.com#narrow/stream/182449-t-compiler/help/topic/Place%202.0%20git%20rebase/near/166711143" class="zl"><img src="https://rust-lang.github.io/zulip_archive/assets/img/zulip.svg" alt="view this post on Zulip" style="width:20px;height:20px;"></a> Santiago Pastorino <a href="https://rust-lang.github.io/zulip_archive/stream/182449-t-compiler/help/topic/Place.202.2E0.20git.20rebase.html#166711143">(May 28 2019 at 12:32)</a>:</h4>
<p>unsure if a procedure like the one I’ve described exist</p>



<a name="166717797"></a>
<h4><a href="https://rust-lang.zulipchat.com#narrow/stream/182449-t-compiler/help/topic/Place%202.0%20git%20rebase/near/166717797" class="zl"><img src="https://rust-lang.github.io/zulip_archive/assets/img/zulip.svg" alt="view this post on Zulip" style="width:20px;height:20px;"></a> nikomatsakis <a href="https://rust-lang.github.io/zulip_archive/stream/182449-t-compiler/help/topic/Place.202.2E0.20git.20rebase.html#166717797">(May 28 2019 at 13:40)</a>:</h4>
<p>I"m not aware of any such procedure. If things get hard enough, I usually flatten to 1 commit and rebase that, and then go back and try to reconstruct intermediate steps.</p>



<a name="166719224"></a>
<h4><a href="https://rust-lang.zulipchat.com#narrow/stream/182449-t-compiler/help/topic/Place%202.0%20git%20rebase/near/166719224" class="zl"><img src="https://rust-lang.github.io/zulip_archive/assets/img/zulip.svg" alt="view this post on Zulip" style="width:20px;height:20px;"></a> Wesley Wiser <a href="https://rust-lang.github.io/zulip_archive/stream/182449-t-compiler/help/topic/Place.202.2E0.20git.20rebase.html#166719224">(May 28 2019 at 13:54)</a>:</h4>
<blockquote>
<p>but seems like if a git rebase step-by-step thing exists it’s better</p>
</blockquote>
<p>There is actually! It's called <a href="https://github.com/mhagger/git-imerge" target="_blank" title="https://github.com/mhagger/git-imerge"><code>git-imerge</code></a>. I've used it before and for complex rebases, it helps a lot</p>



<a name="166719311"></a>
<h4><a href="https://rust-lang.zulipchat.com#narrow/stream/182449-t-compiler/help/topic/Place%202.0%20git%20rebase/near/166719311" class="zl"><img src="https://rust-lang.github.io/zulip_archive/assets/img/zulip.svg" alt="view this post on Zulip" style="width:20px;height:20px;"></a> Wesley Wiser <a href="https://rust-lang.github.io/zulip_archive/stream/182449-t-compiler/help/topic/Place.202.2E0.20git.20rebase.html#166719311">(May 28 2019 at 13:55)</a>:</h4>
<p>It largely works the way you describe <span class="user-mention" data-user-id="116266">@Santiago Pastorino</span></p>



<a name="166720072"></a>
<h4><a href="https://rust-lang.zulipchat.com#narrow/stream/182449-t-compiler/help/topic/Place%202.0%20git%20rebase/near/166720072" class="zl"><img src="https://rust-lang.github.io/zulip_archive/assets/img/zulip.svg" alt="view this post on Zulip" style="width:20px;height:20px;"></a> Santiago Pastorino <a href="https://rust-lang.github.io/zulip_archive/stream/182449-t-compiler/help/topic/Place.202.2E0.20git.20rebase.html#166720072">(May 28 2019 at 14:04)</a>:</h4>
<p><span class="user-mention" data-user-id="125250">@Wesley Wiser</span> cool, I was already thinking on writing such a tool :)</p>



<a name="166720077"></a>
<h4><a href="https://rust-lang.zulipchat.com#narrow/stream/182449-t-compiler/help/topic/Place%202.0%20git%20rebase/near/166720077" class="zl"><img src="https://rust-lang.github.io/zulip_archive/assets/img/zulip.svg" alt="view this post on Zulip" style="width:20px;height:20px;"></a> Santiago Pastorino <a href="https://rust-lang.github.io/zulip_archive/stream/182449-t-compiler/help/topic/Place.202.2E0.20git.20rebase.html#166720077">(May 28 2019 at 14:04)</a>:</h4>
<p>glad that it exists</p>



<hr><p>Last updated: Aug 07 2021 at 22:04 UTC</p>
</html>